From: cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Date: Thu, 15 Sep 2005 17:19:08 +0000 (+0000)
Subject: Maybe fix running bootloader after reboot.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16780^2~69
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8638ed89802a174d39d4a94de48f14a6a8373454;p=xen.git

Maybe fix running bootloader after reboot.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
---

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 863daf75c7..b5b2c6afef 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -984,13 +984,13 @@ class XendDomainInfo:
             self.exportToDB()
             self.restart_state = STATE_RESTART_BOOTING
             if self.bootloader:
-                self.config = self.bootloader_config()
+                self.configure_bootloader()
             self.construct(self.config)
             self.saveToDB()
         finally:
             self.restart_state = None
 
-    def bootloader_config(self):
+    def configure_bootloader(self):
         # if we're restarting with a bootloader, we need to run it
         # FIXME: this assumes the disk is the first device and
         # that we're booting from the first disk
@@ -1005,8 +1005,7 @@ class XendDomainInfo:
             msg = "Had a bootloader specified, but can't find disk"
             log.error(msg)
             raise VmError(msg)
-        config = sxp.merge(['vm', blcfg ], self.config)
-        return config
+        self.config = sxp.merge(['vm', ['image', blcfg]], self.config)
 
     def configure_backends(self):
         """Set configuration flags if the vm is a backend for netif or blkif.